1. Updated a few names/locations

    Closed
    #173909204 16 7 0 0